some more settings from system, also reflect some name changes done a
authorHans Breuer <hans@breuer.org>
Sun, 7 Mar 2004 13:40:19 +0000 (13:40 +0000)
committerHans Breuer <hans@src.gnome.org>
Sun, 7 Mar 2004 13:40:19 +0000 (13:40 +0000)
2004-03-07  Hans Breuer  <hans@breuer.org>

* gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting) :
some more settings from system, also reflect some name changes
done a while ago in the x11 backend

* gdk/win32/makefile.msc : build gdkspawn-win32.c

* gtk/gtkdnd.c : gtk_drag_source_[gs]et_target_list, added "Since: 2.4"

* gtk/makefile.msc.in : build gtkpathbar, link shell32.lib

* tests/makefile.msc : some more tests get build

ChangeLog
ChangeLog.pre-2-10
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8
gdk/win32/gdkproperty-win32.c
gdk/win32/makefile.msc
gtk/gtk.def
gtk/gtkdnd.c
gtk/makefile.msc.in
tests/makefile.msc

index 84454c978592630a074c5093b3dce3470a72f315..7f2d4b589119ae988aabf3e9cf4300c5cb74dea6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-03-07  Hans Breuer  <hans@breuer.org>
+
+       * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting) :
+       some more settings from system, also reflect some name changes
+       done a while ago in the x11 backend
+
+       * gdk/win32/makefile.msc : build gdkspawn-win32.c
+
+       * gtk/gtkdnd.c : gtk_drag_source_[gs]et_target_list, added "Since: 2.4"
+
+       * gtk/makefile.msc.in : build gtkpathbar, link shell32.lib
+
+       * tests/makefile.msc : some more tests get build
+
 Sun Mar  7 03:03:57 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkfilechooserdefault.c
index 84454c978592630a074c5093b3dce3470a72f315..7f2d4b589119ae988aabf3e9cf4300c5cb74dea6 100644 (file)
@@ -1,3 +1,17 @@
+2004-03-07  Hans Breuer  <hans@breuer.org>
+
+       * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting) :
+       some more settings from system, also reflect some name changes
+       done a while ago in the x11 backend
+
+       * gdk/win32/makefile.msc : build gdkspawn-win32.c
+
+       * gtk/gtkdnd.c : gtk_drag_source_[gs]et_target_list, added "Since: 2.4"
+
+       * gtk/makefile.msc.in : build gtkpathbar, link shell32.lib
+
+       * tests/makefile.msc : some more tests get build
+
 Sun Mar  7 03:03:57 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkfilechooserdefault.c
index 84454c978592630a074c5093b3dce3470a72f315..7f2d4b589119ae988aabf3e9cf4300c5cb74dea6 100644 (file)
@@ -1,3 +1,17 @@
+2004-03-07  Hans Breuer  <hans@breuer.org>
+
+       * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting) :
+       some more settings from system, also reflect some name changes
+       done a while ago in the x11 backend
+
+       * gdk/win32/makefile.msc : build gdkspawn-win32.c
+
+       * gtk/gtkdnd.c : gtk_drag_source_[gs]et_target_list, added "Since: 2.4"
+
+       * gtk/makefile.msc.in : build gtkpathbar, link shell32.lib
+
+       * tests/makefile.msc : some more tests get build
+
 Sun Mar  7 03:03:57 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkfilechooserdefault.c
index 84454c978592630a074c5093b3dce3470a72f315..7f2d4b589119ae988aabf3e9cf4300c5cb74dea6 100644 (file)
@@ -1,3 +1,17 @@
+2004-03-07  Hans Breuer  <hans@breuer.org>
+
+       * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting) :
+       some more settings from system, also reflect some name changes
+       done a while ago in the x11 backend
+
+       * gdk/win32/makefile.msc : build gdkspawn-win32.c
+
+       * gtk/gtkdnd.c : gtk_drag_source_[gs]et_target_list, added "Since: 2.4"
+
+       * gtk/makefile.msc.in : build gtkpathbar, link shell32.lib
+
+       * tests/makefile.msc : some more tests get build
+
 Sun Mar  7 03:03:57 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkfilechooserdefault.c
index 84454c978592630a074c5093b3dce3470a72f315..7f2d4b589119ae988aabf3e9cf4300c5cb74dea6 100644 (file)
@@ -1,3 +1,17 @@
+2004-03-07  Hans Breuer  <hans@breuer.org>
+
+       * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting) :
+       some more settings from system, also reflect some name changes
+       done a while ago in the x11 backend
+
+       * gdk/win32/makefile.msc : build gdkspawn-win32.c
+
+       * gtk/gtkdnd.c : gtk_drag_source_[gs]et_target_list, added "Since: 2.4"
+
+       * gtk/makefile.msc.in : build gtkpathbar, link shell32.lib
+
+       * tests/makefile.msc : some more tests get build
+
 Sun Mar  7 03:03:57 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkfilechooserdefault.c
index 5a0adc7286dcf013356bdcf64b6a9d48294a3438..d372d9f8768c978dbe071329a5a10a405b75796a 100644 (file)
@@ -489,6 +489,40 @@ gdk_property_delete (GdkWindow *window,
     }
 }
 
+/*
+  for reference copied from gdk/x11/gdkevents-x11.c
+
+  { "Net/DoubleClickTime", "gtk-double-click-time" },
+  { "Net/DoubleClickDistance", "gtk-double-click-distance" },
+  { "Net/DndDragThreshold", "gtk-dnd-drag-threshold" },
+  { "Gtk/CanChangeAccels", "gtk-can-change-accels" },
+  { "Gtk/ColorPalette", "gtk-color-palette" },
+  { "Gtk/FontName", "gtk-font-name" },
+  { "Gtk/IconSizes", "gtk-icon-sizes" },
+  { "Gtk/KeyThemeName", "gtk-key-theme-name" },
+  { "Gtk/ToolbarStyle", "gtk-toolbar-style" },
+  { "Gtk/ToolbarIconSize", "gtk-toolbar-icon-size" },
+  { "Gtk/IMPreeditStyle", "gtk-im-preedit-style" },
+  { "Gtk/IMStatusStyle", "gtk-im-status-style" },
+  { "Net/CursorBlink", "gtk-cursor-blink" },
+  { "Net/CursorBlinkTime", "gtk-cursor-blink-time" },
+  { "Net/ThemeName", "gtk-theme-name" },
+  { "Net/IconThemeName", "gtk-icon-theme-name" },
+  { "Gtk/ButtonImages", "gtk-button-images" },
+  { "Gtk/MenuImages", "gtk-menu-images" },
+  { "Xft/Antialias", "gtk-xft-antialias" },
+  { "Xft/Hinting", "gtk-xft-hinting" },
+  { "Xft/HintStyle", "gtk-xft-hintstyle" },
+  { "Xft/RGBA", "gtk-xft-rgba" },
+  { "Xft/DPI", "gtk-xft-dpi" },
+
+  // more spread in gtk sources
+  gtk-entry-select-on-focus
+  gtk-cursor-blink
+  gtk-cursor-blink-time
+  gtk-split-cursor
+
+*/
 gboolean
 gdk_screen_get_setting (GdkScreen   *screen,
                         const gchar *name,
@@ -500,16 +534,67 @@ gdk_screen_get_setting (GdkScreen   *screen,
    * XXX : if these values get changed through the Windoze UI the
    *       respective gdk_events are not generated yet.
    */
-  if (strcmp ("double-click-timeout", name) == 0)
+  if (strcmp ("gtk-double-click-time", name) == 0)
     {
-      g_value_set_int (value, GetDoubleClickTime ());
+      gint i = GetDoubleClickTime ();
+      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : %d\n", name, i));
+      g_value_set_int (value, i);
       return TRUE;
     }
-  else if (strcmp ("drag-threshold", name) == 0)
+  else if (strcmp ("gtk-double-click-distance", name) == 0)
     {
-      g_value_set_int (value, MAX(GetSystemMetrics (SM_CXDRAG), GetSystemMetrics (SM_CYDRAG)));
+      gint i = MAX(GetSystemMetrics (SM_CXDOUBLECLK), GetSystemMetrics (SM_CYDOUBLECLK));
+      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : %d\n", name, i));
+      g_value_set_int (value, i);
       return TRUE;
     }
-  else
-    return FALSE;
+  else if (strcmp ("gtk-dnd-drag-threshold", name) == 0)
+    {
+      gint i = MAX(GetSystemMetrics (SM_CXDRAG), GetSystemMetrics (SM_CYDRAG));
+      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : %d\n", name, i));
+      g_value_set_int (value, i);
+      return TRUE;
+    }
+  else if (strcmp ("gtk-split-cursor", name) == 0)
+    {
+      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : FALSE\n", name));
+      g_value_set_boolean (value, FALSE);
+      return TRUE;
+    }
+#if 0
+  /*
+   * With 'MS Sans Serif' as windows menu font (default on win98se) you'll get a 
+   * bunch of :
+   *   WARNING **: Couldn't load font "MS Sans Serif 8" falling back to "Sans 8"
+   * at least with testfilechooser (regardless of the bitmap check below)
+   * so just disabling this code seems to be the best we can do --hb
+   */
+  else if (strcmp ("gtk-font-name", name) == 0)
+    {
+      NONCLIENTMETRICS ncm;
+      ncm.cbSize = sizeof(NONCLIENTMETRICS);
+      if (SystemParametersInfo (SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, FALSE))
+        {
+          /* Pango finally uses GetDeviceCaps to scale, we use simple approximation here */
+          int nHeight = (0 > ncm.lfMenuFont.lfHeight ? -3*ncm.lfMenuFont.lfHeight/4 : 10);
+          if (OUT_STRING_PRECIS == ncm.lfMenuFont.lfOutPrecision)
+            GDK_NOTE(MISC, g_print("gdk_screen_get_setting(%s) : ignoring bitmap font '%s'\n", 
+                                   name, ncm.lfMenuFont.lfFaceName));
+          else if (ncm.lfMenuFont.lfFaceName && strlen(ncm.lfMenuFont.lfFaceName) > 0 &&
+                   /* avoid issues like those described in bug #135098 */
+                   g_utf8_validate (ncm.lfMenuFont.lfFaceName, -1, NULL))
+            {
+              char* s = g_strdup_printf ("%s %d", ncm.lfMenuFont.lfFaceName, nHeight);
+              GDK_NOTE(MISC, g_print("gdk_screen_get_setting(%s) : %s\n", name, s));
+              g_value_set_string (value, s);
+
+              g_free(s);
+              return TRUE;
+            }
+        }
+    }
+#endif
+
+  GDK_NOTE(MISC, g_print("gdk_screen_get_setting(%s) not handled\n", name));
+  return FALSE;
 }
index 3f03b3b7776bd650c4ef675461a8b879caaac90a..ac5779615d603a2865de706e4f934ac5ff7f88ac 100644 (file)
@@ -47,6 +47,7 @@ gdk_win32_OBJECTS = \
 #      gdkregion-win32.obj \
        gdkscreen-win32.obj \
        gdkselection-win32.obj \
+       gdkspawn-win32.obj \
        gdkvisual-win32.obj \
        gdkwin32id.obj \
        gdkwindow-win32.obj
index 343d3ef8fde073fb6fbbf61a800db4785bc992f6..a5275a530998386d3aa5d85dbdbd582beca3de69 100755 (executable)
@@ -26,6 +26,8 @@ EXPORTS
        gtk_accel_map_change_entry
        gtk_accel_map_foreach
        gtk_accel_map_foreach_unfiltered
+       gtk_accel_map_get
+       gtk_accel_map_get_type
        gtk_accel_map_load
        gtk_accel_map_load_fd
        gtk_accel_map_load_scanner
@@ -117,6 +119,7 @@ EXPORTS
        gtk_binding_set_find
        gtk_binding_set_new
        gtk_bindings_activate
+       gtk_bindings_activate_event
        gtk_border_copy
        gtk_border_free
        gtk_border_get_type
@@ -391,6 +394,8 @@ EXPORTS
        gtk_combo_box_new
        gtk_combo_box_new_text
        gtk_combo_box_new_with_model
+       gtk_combo_box_popdown
+       gtk_combo_box_popup
        gtk_combo_box_prepend_text
        gtk_combo_box_remove_text
        gtk_combo_box_set_active
@@ -566,10 +571,12 @@ EXPORTS
        gtk_drag_set_icon_pixmap
        gtk_drag_set_icon_stock
        gtk_drag_set_icon_widget
+       gtk_drag_source_get_target_list
        gtk_drag_source_set
        gtk_drag_source_set_icon
        gtk_drag_source_set_icon_pixbuf
        gtk_drag_source_set_icon_stock
+       gtk_drag_source_set_target_list
        gtk_drag_source_unset
        gtk_drag_unhighlight
        gtk_draw_arrow
@@ -583,6 +590,7 @@ EXPORTS
        gtk_draw_focus
        gtk_draw_handle
        gtk_draw_hline
+       gtk_draw_insertion_cursor
        gtk_draw_layout
        gtk_draw_option
        gtk_draw_polygon
@@ -625,6 +633,7 @@ EXPORTS
        gtk_entry_completion_set_model
        gtk_entry_completion_set_text_column
        gtk_entry_get_activates_default
+       gtk_entry_get_alignment
        gtk_entry_get_completion
        gtk_entry_get_has_frame
        gtk_entry_get_invisible_char
@@ -641,6 +650,7 @@ EXPORTS
        gtk_entry_prepend_text
        gtk_entry_select_region
        gtk_entry_set_activates_default
+       gtk_entry_set_alignment
        gtk_entry_set_completion
        gtk_entry_set_editable
        gtk_entry_set_has_frame
@@ -682,6 +692,7 @@ EXPORTS
        gtk_file_chooser_add_shortcut_folder_uri
        gtk_file_chooser_dialog_get_type
        gtk_file_chooser_dialog_new
+       gtk_file_chooser_dialog_new_with_backend
        gtk_file_chooser_error_get_type
        gtk_file_chooser_error_quark
        gtk_file_chooser_get_action
@@ -700,6 +711,7 @@ EXPORTS
        gtk_file_chooser_get_type
        gtk_file_chooser_get_uri
        gtk_file_chooser_get_uris
+       gtk_file_chooser_get_use_preview_label
        gtk_file_chooser_list_filters
        gtk_file_chooser_list_shortcut_folder_uris
        gtk_file_chooser_list_shortcut_folders
@@ -721,11 +733,13 @@ EXPORTS
        gtk_file_chooser_set_preview_widget_active
        gtk_file_chooser_set_select_multiple
        gtk_file_chooser_set_uri
+       gtk_file_chooser_set_use_preview_label
        gtk_file_chooser_unselect_all
        gtk_file_chooser_unselect_filename
        gtk_file_chooser_unselect_uri
        gtk_file_chooser_widget_get_type
        gtk_file_chooser_widget_new
+       gtk_file_chooser_widget_new_with_backend
        gtk_file_filter_add_custom
        gtk_file_filter_add_mime_type
        gtk_file_filter_add_pattern
@@ -772,6 +786,7 @@ EXPORTS
        gtk_file_selection_set_filename
        gtk_file_selection_set_select_multiple
        gtk_file_selection_show_fileop_buttons
+       gtk_file_system_create_folder
        gtk_file_system_error_quark
        gtk_file_system_filename_to_path
        gtk_file_system_get_folder
@@ -854,7 +869,6 @@ EXPORTS
        gtk_grab_get_current
        gtk_grab_remove
        gtk_handle_box_get_handle_position
-       gtk_handle_box_get_private
        gtk_handle_box_get_shadow_type
        gtk_handle_box_get_snap_edge
        gtk_handle_box_get_type
@@ -1031,7 +1045,6 @@ EXPORTS
        gtk_init_check
        gtk_init_check_abi_check
        gtk_input_add_full
-       gtk_input_dialog_get_private
        gtk_input_dialog_get_type
        gtk_input_dialog_new
        gtk_input_remove
@@ -1236,6 +1249,7 @@ EXPORTS
        gtk_menu_set_accel_group
        gtk_menu_set_accel_path
        gtk_menu_set_active
+       gtk_menu_set_monitor
        gtk_menu_set_screen
        gtk_menu_set_tearoff_state
        gtk_menu_set_title
@@ -1372,6 +1386,7 @@ EXPORTS
        gtk_paned_pack1
        gtk_paned_pack2
        gtk_paned_set_position
+       gtk_path_bar_get_type
        gtk_parse_args
        gtk_path_priority_type_get_type
        gtk_path_type_get_type
@@ -1456,8 +1471,11 @@ EXPORTS
        gtk_radio_menu_item_get_group
        gtk_radio_menu_item_get_type
        gtk_radio_menu_item_new
+       gtk_radio_menu_item_new_from_widget
        gtk_radio_menu_item_new_with_label
+       gtk_radio_menu_item_new_with_label_from_widget
        gtk_radio_menu_item_new_with_mnemonic
+       gtk_radio_menu_item_new_with_mnemonic_from_widget
        gtk_radio_menu_item_set_group
        gtk_radio_tool_button_get_group
        gtk_radio_tool_button_get_type
@@ -1528,6 +1546,8 @@ EXPORTS
        gtk_ruler_set_range
        gtk_scale_get_digits
        gtk_scale_get_draw_value
+       gtk_scale_get_layout
+       gtk_scale_get_layout_offsets
        gtk_scale_get_type
        gtk_scale_get_value_pos
        gtk_scale_set_digits
@@ -1889,6 +1909,7 @@ EXPORTS
        gtk_text_layout_set_cursor_direction
        gtk_text_layout_set_cursor_visible
        gtk_text_layout_set_default_style
+       gtk_text_layout_set_keyboard_direction
        gtk_text_layout_set_preedit_string
        gtk_text_layout_set_screen_width
        gtk_text_layout_spew
@@ -2004,6 +2025,7 @@ EXPORTS
        gtk_toggle_action_get_active
        gtk_toggle_action_get_draw_as_radio
        gtk_toggle_action_get_type
+       gtk_toggle_action_new
        gtk_toggle_action_set_active
        gtk_toggle_action_set_draw_as_radio
        gtk_toggle_action_toggled
@@ -2100,6 +2122,7 @@ EXPORTS
        gtk_tooltips_disable
        gtk_tooltips_enable
        gtk_tooltips_force_window
+       gtk_tooltips_get_info_from_tip_window
        gtk_tooltips_get_type
        gtk_tooltips_new
        gtk_tooltips_set_delay
@@ -2444,6 +2467,7 @@ EXPORTS
        gtk_widget_activate
        gtk_widget_add_accelerator
        gtk_widget_add_events
+       gtk_widget_add_mnemonic_label
        gtk_widget_can_activate_accel
        gtk_widget_child_focus
        gtk_widget_child_notify
@@ -2502,6 +2526,7 @@ EXPORTS
        gtk_widget_is_ancestor
        gtk_widget_is_focus
        gtk_widget_list_accel_closures
+       gtk_widget_list_mnemonic_labels
        gtk_widget_map
        gtk_widget_mnemonic_activate
        gtk_widget_modify_base
@@ -2526,6 +2551,7 @@ EXPORTS
        gtk_widget_ref
        gtk_widget_region_intersect
        gtk_widget_remove_accelerator
+       gtk_widget_remove_mnemonic_label
        gtk_widget_render_icon
        gtk_widget_reparent
        gtk_widget_reset_rc_styles
@@ -2572,6 +2598,7 @@ EXPORTS
        gtk_widget_unref
        gtk_window_activate_default
        gtk_window_activate_focus
+       gtk_window_activate_key
        gtk_window_add_accel_group
        gtk_window_add_embedded_xid
        gtk_window_add_mnemonic
@@ -2618,6 +2645,7 @@ EXPORTS
        gtk_window_parse_geometry
        gtk_window_position_get_type
        gtk_window_present
+       gtk_window_propagate_key_event
        gtk_window_remove_accel_group
        gtk_window_remove_embedded_xid
        gtk_window_remove_mnemonic
index 4dac76ed0945c39ff440997899ab663aa359983f..146eb2f509ac21c78194a78996ca42ab0d2f7b32 100644 (file)
@@ -2109,6 +2109,8 @@ gtk_drag_source_unset (GtkWidget        *widget)
  * drag-and-drop.
  *
  * Return value: the #GtkTargetList, or %NULL if none
+ *
+ * Since: 2.4
  **/
 GtkTargetList *
 gtk_drag_source_get_target_list (GtkWidget *widget)
@@ -2130,6 +2132,8 @@ gtk_drag_source_get_target_list (GtkWidget *widget)
  * Changes the target types that this widget offers for drag-and-drop.
  * The widget must first be made into a drag source with
  * gtk_drag_source_set().
+ *
+ * Since: 2.4
  **/
 void
 gtk_drag_source_set_target_list (GtkWidget     *widget,
index 54c0da739d77fb83a6b6ff22cbcb6eed3c9527ca..98ef8d190f4339c73cb5ff4520924eb61f0f2b1d 100644 (file)
@@ -161,6 +161,7 @@ gtk_OBJECTS =                                       \
        gtkoldeditable.obj                      \
        gtkoptionmenu.obj                       \
        gtkpaned.obj                            \
+       gtkpathbar.obj                          \
        gtkpixmap.obj                           \
 #      gtkplug.obj                             \
        gtkpreview.obj                          \
@@ -485,7 +486,7 @@ gtk.res : gtk.rc
 libgtk-win32-$(GTK_VER)-0.dll : $(gtk_OBJECTS) gtk.def gtk.res
        $(CC) $(CFLAGS) -LD -Fm -Fe$@ $(gtk_OBJECTS) gtk.res \
        $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) \
-       gdi32.lib user32.lib advapi32.lib wsock32.lib \
+       gdi32.lib user32.lib advapi32.lib wsock32.lib shell32.lib \
        $(LDFLAGS) /implib:gtk-win32-$(GTK_VER).lib /def:gtk.def
 
 gtk-win32-$(GTK_VER)s.lib : $(gtk_OBJECTS)
index 02b599a096730a2cfa817f2d89cce070efbb1a18..a38502ee50e94dc36fca271667db7574da6a2d2b 100644 (file)
@@ -40,8 +40,9 @@ all : \
 #
 TESTAPPS = \
        testabi testactions \
-       testcalendar testcombo \
+       testcalendar testcombo testcombochange \
        testdnd \
+       testentrycompletion \
        testfilechooser \
        testgtk \
        testicontheme testinput \
@@ -52,9 +53,12 @@ TESTAPPS = \
        testtreecolumns testtreeedit testtreeflow testtreefocus \
        testtreesort testtreeview treestoretest \
        testsocket testsocket_child \
-       testthreads \
+       testthreads testxinerama \
        simple 
 
+# syntax error : illegal character '-' in macro
+#stresstest-toolbar
+
 
 all-test-apps: 
        for %d in ($(TESTAPPS)) do nmake -nologo -f makefile.msc one-test-app THIS=%d